Merge git://git.denx.de/u-boot-usb
authorTom Rini <[email protected]>
Mon, 7 Sep 2015 12:56:23 +0000 (08:56 -0400)
committerTom Rini <[email protected]>
Mon, 7 Sep 2015 12:56:23 +0000 (08:56 -0400)

Trivial merge